Autogenerated HTML docs for v1.7.10.2-484-gcd07c
diff --git a/RelNotes/1.7.10.2.txt b/RelNotes/1.7.10.2.txt index 55e960a..7a7e9d6 100644 --- a/RelNotes/1.7.10.2.txt +++ b/RelNotes/1.7.10.2.txt
@@ -14,6 +14,9 @@ * HTTP transport that requires authentication did not work correctly when multiple connections are used simultaneously. + * Minor memory leak during unpack_trees (hence "merge" and "checkout" + to check out another branch) has been plugged. + * In the older days, the header "Conflicts:" in "cherry-pick" and "merge" was separated by a blank line from the list of paths that follow for readability, but when "merge" was rewritten in C, we lost it by @@ -52,13 +55,24 @@ * "git push" over smart-http lost progress output a few releases ago; this release resurrects it. + * The error and advice messages given by "git push" when it fails due + to non-ff were not very helpful to new users; it has been broken + into three cases, and each is given a separate advice message. + * The insn sheet given by "rebase -i" did not make it clear that the insn lines can be re-ordered to affect the order of the commits in the resulting history. + * "git repack" used to write out unreachable objects as loose objects + when repacking, even if such loose objects will immediately pruned + due to its age. + * A contrib script "rerere-train" did not work out of the box unless user futzed with her $PATH. + * "git rev-parse --show-prefix" used to emit nothing when run at the + top-level of the working tree, but now it gives a blank line. + * The i18n of error message "git stash save" was not properly done. * "git submodule" used a sed script that some platforms mishandled.
diff --git a/RelNotes/1.7.11.txt b/RelNotes/1.7.11.txt index 37f374b..9ef7e18 100644 --- a/RelNotes/1.7.11.txt +++ b/RelNotes/1.7.11.txt
@@ -53,9 +53,6 @@ * The "fmt-merge-msg" command learns to list the primary contributors involved in the side topic you are merging. - * The cases "git push" fails due to non-ff can be broken into three - categories; each case is given a separate advise message. - * "git rebase" learned to optionally keep commits that do not introduce any change in the original history. @@ -94,21 +91,11 @@ * "git apply" had some memory leaks plugged. - * "git repack" used to write out unreachable objects as loose objects - when repacking, even if such loose objects will immediately pruned - due to its age. - * Setting up a revision traversal with many starting points was inefficient as these were placed in a date-order priority queue one-by-one. Now they are collected in the queue unordered first, and sorted immediately before getting used. - * "git rev-parse --show-prefix" used to emit nothing when run at the - top-level of the working tree, but now it gives a blank line. - - * Minor memory leak during unpack_trees (hence "merge" and "checkout" - to check out another branch) has been plugged. - * More lower-level commands learned to use the streaming API to read from the object store without keeping everything in core. @@ -129,6 +116,14 @@ releases are contained in this release (see release notes to them for details). + * The DWIM behaviour for "log --pretty=format:%gd -g" was somewhat + broken and gave undue precedence to configured log.date, causing + "git stash list" to show "stash@{time stamp string}". + (merge 55ccf85 jk/maint-reflog-walk-count-vs-time later to maint). + + * Running "git checkout" on an unborn branch used to corrupt HEAD. + (merge 8338f77 ef/checkout-empty later to maint). + * When checking out another commit from an already detached state, we used to report all commits that are not reachable from any of the refs as lossage, but some of them might be reachable from the new diff --git a/git-submodule.html b/git-submodule.html index 324ba84..20cecec 100644 --- a/git-submodule.html +++ b/git-submodule.html
@@ -725,16 +725,14 @@ checkout the commit specified in the index of the containing repository. This will make the submodules HEAD be detached unless <tt>--rebase</tt> or <tt>--merge</tt> is specified or the key <tt>submodule.$name.update</tt> is set to - <tt>rebase</tt>, <tt>merge</tt> or <tt>none</tt>. + <tt>rebase</tt>, <tt>merge</tt> or <tt>none</tt>. <tt>none</tt> can be overriden by specifying + <tt>--checkout</tt>. </p> <div class="paragraph"><p>If the submodule is not yet initialized, and you just want to use the setting as stored in .gitmodules, you can automatically initialize the submodule with the <tt>--init</tt> option.</p></div> <div class="paragraph"><p>If <tt>--recursive</tt> is specified, this command will recurse into the registered submodules, and update any nested submodules within.</p></div> -<div class="paragraph"><p>If the configuration key <tt>submodule.$name.update</tt> is set to <tt>none</tt> the -submodule with name <tt>$name</tt> will not be updated by default. This can be -overriden by adding <tt>--checkout</tt> to the command.</p></div> </dd> <dt class="hdlist1"> summary @@ -971,7 +969,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-03-31 11:18:40 PDT +Last updated 2012-05-11 13:03:27 PDT </div> </div> </body>
diff --git a/git-submodule.txt b/git-submodule.txt index c243ee5..c83a856 100644 --- a/git-submodule.txt +++ b/git-submodule.txt
@@ -140,7 +140,8 @@ checkout the commit specified in the index of the containing repository. This will make the submodules HEAD be detached unless `--rebase` or `--merge` is specified or the key `submodule.$name.update` is set to - `rebase`, `merge` or `none`. + `rebase`, `merge` or `none`. `none` can be overriden by specifying + `--checkout`. + If the submodule is not yet initialized, and you just want to use the setting as stored in .gitmodules, you can automatically initialize the @@ -148,10 +149,6 @@ + If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within. -+ -If the configuration key `submodule.$name.update` is set to `none` the -submodule with name `$name` will not be updated by default. This can be -overriden by adding `--checkout` to the command. summary:: Show commit summary between the given commit (defaults to HEAD) and
diff --git a/git.txt b/git.txt index 8527775..c543213 100644 --- a/git.txt +++ b/git.txt
@@ -44,9 +44,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.10.1/git.html[documentation for release 1.7.10.1] +* link:v1.7.10.2/git.html[documentation for release 1.7.10.2] * release notes for + link:RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.1.txt[1.7.10.1], link:RelNotes/1.7.10.txt[1.7.10].
diff --git a/gitmodules.html b/gitmodules.html index cb85e44..e9d3912 100644 --- a/gitmodules.html +++ b/gitmodules.html
@@ -627,9 +627,14 @@ the commit specified in the superproject. If <em>merge</em>, the commit specified in the superproject will be merged into the current branch in the submodule. - This config option is overridden if <em>git submodule update</em> is given - the <em>--merge</em> or <em>--rebase</em> options. + If <em>none</em>, the submodule with name <tt>$name</tt> will not be updated + by default. </p> +<div class="literalblock"> +<div class="content"> +<pre><tt>This config option is overridden if 'git submodule update' is given +the '--merge', '--rebase' or '--checkout' options.</tt></pre> +</div></div> </dd> <dt class="hdlist1"> submodule.<name>.fetchRecurseSubmodules @@ -697,7 +702,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-03-31 11:18:40 PDT +Last updated 2012-05-11 13:03:27 PDT </div> </div> </body>
diff --git a/gitmodules.txt b/gitmodules.txt index 4e1fd52..4effd78 100644 --- a/gitmodules.txt +++ b/gitmodules.txt
@@ -41,8 +41,11 @@ the commit specified in the superproject. If 'merge', the commit specified in the superproject will be merged into the current branch in the submodule. + If 'none', the submodule with name `$name` will not be updated + by default. + This config option is overridden if 'git submodule update' is given - the '--merge' or '--rebase' options. + the '--merge', '--rebase' or '--checkout' options. submodule.<name>.fetchRecurseSubmodules:: This option can be used to control recursive fetching of this
